treeview: Always call size request funcs with valid out pointers
authorBenjamin Otte <otte@redhat.com>
Thu, 1 May 2014 13:16:17 +0000 (15:16 +0200)
committerBenjamin Otte <otte@redhat.com>
Thu, 1 May 2014 13:16:17 +0000 (15:16 +0200)
Not doing so causes crashes since
a158a2aa48c8023f99963642cc2657bff207b82NULLd

gtk/gtktreeview.c

index 9de4db6c3c4727640e15aef6426a3ba64db5bbe6..891a55cc7669818cb2532ea6f211f3e425c2e498 100644 (file)
@@ -6805,6 +6805,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
   if (validated_area)
     {
       GtkRequisition requisition;
+      gint dummy;
 
       /* We temporarily guess a size, under the assumption that it will be the
        * same when we get our next size_allocate.  If we don't do this, we'll be
@@ -6821,8 +6822,8 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
        * untill we've recieved an allocation (never update scroll adjustments from size-requests).
        */
       prevent_recursion_hack = TRUE;
-      gtk_tree_view_get_preferred_width (GTK_WIDGET (tree_view), &requisition.width, NULL);
-      gtk_tree_view_get_preferred_height (GTK_WIDGET (tree_view), &requisition.height, NULL);
+      gtk_tree_view_get_preferred_width (GTK_WIDGET (tree_view), &requisition.width, &dummy);
+      gtk_tree_view_get_preferred_height (GTK_WIDGET (tree_view), &requisition.height, &dummy);
       prevent_recursion_hack = FALSE;
 
       /* If rows above the current position have changed height, this has